| 
                
               | 
              
                
               | 
              
                @@ -175,6 +175,7 @@ def query_usergoods(request): 
               | 
            
            
            
              | 
                175
               | 
              
                175
               | 
              
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            
            
            
              | 
                176
               | 
              
                176
               | 
              
                     admin_id = request.POST.get('admin_id', '')
               | 
            
            
            
              | 
                177
               | 
              
                177
               | 
              
                     user_id = request.POST.get('user_id', '')
               | 
            
            
            
              | 
                
               | 
              
                178
               | 
              
                +    dupload = request.POST.get('dupload', '')
               | 
            
            
            
              | 
                178
               | 
              
                179
               | 
              
                  
               | 
            
            
            
              | 
                179
               | 
              
                180
               | 
              
                     if brand_id != settings.KODO_DEFAULT_BRAND_ID: 
               | 
            
            
            
              | 
                180
               | 
              
                181
               | 
              
                         return response(ProductBrandStatusCode.BRAND_NOT_MATCH) 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -191,6 +192,10 @@ def query_usergoods(request): 
               | 
            
            
            
              | 
                191
               | 
              
                192
               | 
              
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) 
               | 
            
            
            
              | 
                192
               | 
              
                193
               | 
              
                  
               | 
            
            
            
              | 
                193
               | 
              
                194
               | 
              
                     logs = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=administrator.brand_id, user_id=user_id, status=True).order_by('-pk')
               | 
            
            
            
              | 
                
               | 
              
                195
               | 
              
                + 
               | 
            
            
            
              | 
                
               | 
              
                196
               | 
              
                +    if dupload: 
               | 
            
            
            
              | 
                
               | 
              
                197
               | 
              
                +        logs = logs.filter(dupload=dupload) 
               | 
            
            
            
              | 
                
               | 
              
                198
               | 
              
                + 
               | 
            
            
            
              | 
                194
               | 
              
                199
               | 
              
                     logs = [log.adminuserdata for log in logs] 
               | 
            
            
            
              | 
                195
               | 
              
                200
               | 
              
                  
               | 
            
            
            
              | 
                196
               | 
              
                201
               | 
              
                     return response(200, 'Userinfo Goods Success', u'用户商品列表获取成功', data={
               |